Adding in the new logic for author and time to match the local version.