v2.1b in progress