more changes for different conditions