Minor modification on alimentation choice