Need to create a hook for this