Changed timestamp to use SimpleDateFormat