Updating to latest - and with new time formatting