More work on bootstrap