merged version
more changes from main