Parity with bootstrap3 branch