added more queries and responses