still has a couple of problems