last changes of v1 prior to moving to v2. V1 now on hold.