Added ?? to condense return statement