added current_timestamp
slightly changed style