Added a flag to control face setting