Updated for initial application of bootstrap