Small modification of COnfigureation