0.9.6 take two