Made some big changes