added more hooks