added setup changes