Made requested changes