added more condtinals