my new fixes
my new fixes