Added some conditionals for 14.2