Changed names of files to match shanti convention. Replaced some code that was lost from a merge