some final modifications