Almost everything is fixed !