Huge improvement
Full dictionary