Today
Follow Daniel's advice of merging two redundant code paths into one