attempt#111
Fixing bugs