OOP Spot-check added