minor modifications —> should be done locally from now on !!!!!