modified welcome and edit