enable the goals to be returned and move the focuing functions
enable the goals to be returned and move the focuing functions