Added conditional for testing