Files modified for Salvador to use