merged with jeffery's table