incorporated ben's edits