Adapting to new bootstrap