Added better badging