Minor changes and rollback to dcc - adrien