[UPDATE] changed hardcoded table names