Added OS check