Small changes to shape movement checking