Updated to check time
Merge commit 'af9de85aaacff34207c8f478c82c19dc59617669' into HEAD