implementing changes as requested