implementing requested changes