made some change according to recommendation