added Jan's dias
clean up