optimized table, removed redundency