More tweaks done for the weight