modified files sorry from last commit...
mergin in Iain's changes