Updated: Begin to use tables