Changed to support big input in Q2