Add additional feature
ok
Finish the time prescription
Finish some changes
Merge with updated branch