Some things I thought I'd change..