final changes before the code swithcing workshop deadline