Manu, many changes .. upload #2