added a stub function I forgot
added another stub I forgot
Merge remote-tracking branch 'upstream/master'