No more dep on q or flatten