First implementation of work on NA values