Improve for Dwelling chapter 1 @dougkarr