dev_1.1: updates