switch to unix timestamp, add json masking