change to make it elastic and add current time