Bugs have been fixed, entire file is used now