Modify newer versions be in else and use OS name instead of version