Rebuilding some changes lost in the last commit