Simplified to single subgoal