Started performance tweaking