renamed and replaced a few hooks