More specific if statements for tighter control
Another merge