Bugfix/002 a good goodbye