WIP12.1

tiny changes