More work towards bootstrap