Setup more correct