changed excludes to be optional