added some design changes-