More changes to initial impl