reorg from will's changes