Did changes as requested