JR1000 refactored further