code reconsitution, also resolve bugs.