Reverting to working version with optimized bootstrap