Updated to remove focus and fix typos