Finally going in the right direction.