New changes as requested by Dr. Ruwan