removed some changes here from htordeux. Where there a fault /problem ?