Changed function signatures - sorry

for consistency