Updated problem generation