implemented few changes