Added limits for goals