Dev #21 revert