Tag: adapt to new requirements