first mods still in svn, but merged here