Label refactored
WIP