Final Update before move to the lab

Signed-off-by: Andoni Aguirrezabal <aaguirrezabal@live.com>