will clean it up as dan edits the view