new changes by dev jemo