V2

See new rules in #70