Almost fixed ALL Submit issues