reverting: "A few changes to better work for our needs"