Small refactor, added spotCheck