Few modifications after session with Bjarni.