More fine tuning on input