Yet another revision

Damn Ian this sucked more than I thought