refactoring code to work with the latest rms versions...work starts