labeling improved ; before fixing submapping bug