No longer checking for bad loops
Merge branch 'update_database'