Add phase 2

haven't debug yet