Merged Nikhil's comp also