updated with latest vars
0.0.2