added focus wrapping