new code phase 1