trying again with raveState

instead of using rave twice