quick fit, almost working