Switched to maths rather than set membership