FIX CLIENT NAME/INPUTS