Cleaned up predicates..