updated, need to reinsert hooks check