Added some date picker code