Modifications to RAP to run on e4