added macro for building shapes