Should we move these two lines also?