change after merge with simon
include rpl
logging stuff