Made a few changes...