Removing datetime
Changing code a little bit