added better bootstrap integration