Updates based on review by @satazor