FIXING SHIT SO LAST MINUTE T_T