Improves it a lot though it's far from ready