Make the inputs post flow better