Reworked activity flow