Finished putting in Ria's changes