renamed and added shapes