Added RAP e4. Now single source on RCP and RAP