Rivera: New Version of Single Payer Bill Coming in January