change and shorten (almost) everything