Partial changes (untested)...