Adding in square as it was in the sourcecode