Updated input generator