changes from shanoj and payment fix