Added mapping stuff for squares