Merged file of Kelvin and Prakhar