I have change the stuff around a bit. Please take a look if that's acceptable.