merge with anton and some small changes in base