Add hooks part ii