Some useful modifications