Final modifications done