Updated for 0.2