Updated Calclavia's mods