adding focus
Merge