Fixes for chapter 5 (fix ADD-INCOMING)