pushing changes from erics