added ignore and updated conditionals