almost working now