leftover snippet from merge