Update based on Kannan Manickam's comments