Updated two hooks