Added requested changes