Simplified signatures too much...restored a little.