Added intial NA handling