more bootstrap integration work