Novaspirit + jh00's Commit