tried some stuff but i'm going to revert this anyway