Changed designations
Merge branch 'select_date'