added stuff for hooks