Now it's almost working