add date and size infos and refactoring
fix conflict