Reverting label logic to match the tutorial