[1.01]fixed merge conflicts, cleanup, is working - ownrides #not(LG, JL)