Add the rest figures
Add random figure generation