Updated variables to match with moulinette