#9: Frontend optimizations (2)