Added type uf to case statement
Commiting updates