Added OS version check