more stuff lost in merge....