before merging
query added