fixed changes suggested by shashank