I merge the  Manuel version