undefined's replaced by return's in samples