implemented few new changes