Changed second when to add