I guess validate handles both now?