Improve performance in l3 submode