reviwed fixes done by chhavi, will do more review