Combat collab with @chirspy (remastered)