add bootstrap & update regex