Some modifications in custom/