take empty out here, also