setup looking better now