Tweaking for later supplying of additional commands for #50