Replaced ?? with None values to be more clear