Added props, refined shapes