full commit until email parsing issue