CFY-901 lots of optimizations