Modified activity flow