extend chapter 1 and add draft-warning