updated jsf
updated model