Latest set of changes, taken from dve and added to repo