Small updates to Ass2.1