Lint
Tweak timing
Don't need THIS anymore!