added Guard for automated testing