added timestamp
added time function