Added goal checking