Update with feedback from Solar Designer.