missing files
removed some checks