additional updates
uf 05 related changes