added few changes