first commit
finish square
Fix