Make one bundle. Some other changes