Jody's commit