Added a change mode, proof of concept