Re add moonflower with Jordach changes