added a todo concerning timestamp preserving