update to work with more merged changes...........