improved shapes