following remi's comments