[0.0.21m] Added some function in prep for major patch