RM

updated fields, still work in progress