Adding in an update to handle excludes in a smarter manner.