James C - refactor
James C - nuked guard