some changes, work in progress