Changed/removed code to create custom setup