Code reorganisation. Arrays of labels added