Removed goto…apparently not good