This should be in a partial