Added some final changes