merging
added time fields to workout