fixed old awkward stuff