feat: partial revert to level change to reduce casting and only casting where we need