structure the RBM a bit better