re-arranged guard blocks
more imports around gard block