UI model improvement
hook to logic