Change to use getTime() of Date