Complete functions to spec