Surely we still need to do this (after the HS lookup?)