Changed to remove time logging