Added Guard for automatic testing