working on fixing bugs ..