LUN-66 optimization