more progress
better way to take care of the input-inputs