Timer draft / some changes on Vehicle model