New settings and improvements