changed to encorporate time