Attempt to improve 302M some more