#fixing bugs