Bug Fix And Improvement