OS check added