Changes to 'SPACEWALK-1.5'