added return on table end