add newer changes by dev jemo