Fixed Trevor's Issues