reconsitution and bug fixed