works for full set now