removed soa changes that sneaked in