Changes to 'SPACEWALK-2.0'