Updated for 0.3.3