Finished Mel's edits