Some changes... added some functions...