added better shapes