More badges implemented