Result handling improved
7 files changed