fixing conditions brackets
fixing dal