added time output and currency