Version 1, Shape and Square added.