updates for 0.6 or whatever