RMI440 changes