Use "basetimestamp" and simplity; fix double counting