Re-instated changes from yesterday. Issues stemmed from database, not code