DSR optimizations
These have not been testing thoroughly and might break things subtley. Handle with care.
Merge branch 'master' of https://github.com/maltic/uwa-cits4419