Nacer's changes