New settings + optimizations