Added Goal Checks