added some final changes