Get version check into functions