Fixed faces and added context annotation