Updated from my local version, some hooks need to

be added