Update for 0.2 -- Breaks 0.1