Working jrc

Please merge my edits