intelli: Sync with @neobuddy89
Looks like it's better than how I left it, thanks!