Made some changes but still don't know if it'd work