Finish the main logic.
update
update
Merge branch 'develop'