Refactored faceselector.