Made rhomtess more efficient