refactoring and embiggening touch points