got it compiling and with no regressions