Final modifications