Added Larona's Changes again. They keep getting overwritten!!!