SF over original pull

Please remove last commit if you prefer previous method names. Thanks