merge in major updates