@hsingh123 Need to get rid of this last if-else statement too..