Putting this in a different hook as well