Simplify custom checks

Rewrite checks, original implementation due to misunderstanding of docs