Layout adapted II