; Implement Stefan's feedback on last two commits