Added substitute value returns.