reasonably tested, preparing for merge