edit almost working