setup made better