Added Guard for automated testing