Fixed Trevor's Issues again