added some sql queries to find info
fix merge conflict