Added checks to allow corner-3 to work