changed from three tables to two tables
v0.0.2