Fix bugs. Good results