New interface

Revised the interface according to discussion in 12/5 meeting