Commit before Lorin craziness