John's commit