working on 3.1b