Added sanitizing