Change to spuclib