massive changes... removed php