with sanitising functions
initial fix for sanitisation functions