Minimum to get it to build with new system