update today based on @erikj's improvements