More RPT changes, remember to update the SCons-file to build it