Added in some more goals checks, not sure if they wor correctly