changed empty dict to None