Tidy existing and add BS3