commented out optimization, it broke stuff. Will re-visit later