new changes by jemo 5:49pm