Updated to shine 2.0.0