fixed bug, labelling capability added