When Tomorrow Comes - Remastered Version