merging with dvanliere changes