Changes for initial setup