Added indicator logic to inputs