FIRST COMMIT WITH EVERYTHING, but second pass is not working