some final changed