New setup can be merged into master