RUM: some cleanup
RUM2: cleanups
current working version