switched over to some automated tables