Added two hooks