Changed timestamp to date instead of sting