Finish queries and triggers
Final update for assignment