updates to make it compile and merge properly ...