0.9.4 take two