standalone end to end changes