JR: Some stupid changes