address feedback from Johan's review