Improved timing checks
Removed cruft
Converted subquery to left join