restoring some stuff that went missing in merge