I think this forced me to commit everything twice