some more initial modifications