Rework entry points for activity