updated with square corners