fixed requested changes