Updated for 0.12