merged in kevin\'s work