v0.9.8DEV / Optimizations