some changes to works
merge