adding label handling