Initial qs setup changes