added version & pre 11.36 check