vampay changes
all merged