added namespace edits