Cleared code up
Switched back to old legacy label