Better to use a tuple here?