Uses generation now

Signed-off-by: tfliu <thomasliu02@gmail.com>