fixing bugs
commit works
commit works
fixed
fixed
fixed