Layout 2 enhancement