Adressed Mathias comments