final version 2.2 , query tested