phase1 fixed !