Corrected initial setup code