fixed senario issues #184
added uml #184