Smarter pathmaking and includes.