adding guard support for faster testing