shapes working correctly