modified according to commits
removed raise statement