fixed setup code...