removed output
added twinkle and query
moved query