updates, almost working