reorganise into catergories