notes from @cyplo's review