This version fixed many bugs