Drastic performance increase. Helps address #108