Adjustments made for v0.2