added version check to support condtionals