1.015 Rework by Pyrah