Slimmed down 300 bytes more (~8%)