missing functions

from master