v0.004 Added check for 'record'