enhancement? to simple setup