Changes per feedback (thanks!)