Issue #50: Include @50Wliu feedback