big changes, refining actions and tasks