few changes to make other scenarios work