Added: Simpler bootstrap reinstated