Fixed errors as adviced-