Added Timestamp and Toggle