a few brutal changes :)