Added + Fixed timestamp