Updated checkers to new standard