added datetime, etc.
fixed merge