Updating 'to' Label
More tweaking