merge in major changes