Issue #16: modifying code order