Committing what I think is my final edit before submission. Kasun needs to check over references