shaping up the tabs. safety commit.