trayer fix and stuff