Retrofitting back to sam's repo