Rename some variables
Avoid complicated if statement to ensure that 
 is not pruned