James C - more light refactoring
James C - more refactoring