dmiles: changes to align closer to needs