changed timing back and broke some more stuff apparently