merging in changes from dricode