Update with loraderon changes