implemented few changes
implemented few changes