Timefield and computation added