removed dupe, fixed order