addressed comment from Jordi and fosdev