added EditText handling.