recent changes, almost working