directly pulled from sf master by myself 2