added capture view
fixed conflict