Modified predicates, does not fully work yet.