Put in sq and decreased degree
Done and done
Merge branch 'master' into fix-line-following
line following is (hopefully) done