Added extra checks, renamed file to avoid problems