change inputs, add syntax checks
fix merge conflict