set default waterweight to 35% of total weight and migrated to classy loader