RMI Temp updates (ready for demo)