Nicholas - Commit 2
Nicholas - Commit 3

Optimized the query.