#119: address feedback