fixed fn signatures.