Feanil/proper extra vars