Improved performance + skip implementation + basic build.