almost working again