v 2.0

(preliminary)