Fixed start and goal logic