structure and badge changes