Upgraded flatiron to 0.3.x