full code path basic checks added