Insourced some variable assignments