Some modifications in the inline functions