Small changes, should work (right?)