Checker class was changed a bit