implemented changes as requested