Small changes - Query 1 workiing