add table and switch to Makefile