changed all remaining L_shr_o and activated macro