Updated with bootstrap methods