Better validation + fixing function call to match new signature.