Added modifications as requested #1