Changed more code