v2

addtional queries, new design , fix minor bugs etc.
v2

commit new changes