Modified scenario, various fixes