Added eye and mouth detection