Fit to dev branch