Added version condition