Starting on some optimizations.