Made changes to save on closing tabs