significant changes

update in progress