merge (nerfed+new features)