Simplified dependancies based on comments from Matthew