FIXED BUG AND UPDATE