Ori's update

this is shit, gonna revert