added few modifications