fix
optimizations