bug fix / id's, labels changed