added initial work for enabling additional optimizations