Updating for 0.9