Milestone 1

Milestone 1. modify some details