pulling trixt0rs changes