Improving behavior for when I change things around