ready for fixing bugs
bug fix done