remove debug code
use timestamp instead of random