refactor
move timestamp row