ADD: complete check + other stuff