Changes related to aeroplane functionality