@eiriksm Updated the MR !1 Please review.