almost there - changes to hook