make control build against new comm and sp. Does not do anything correctly, though