made SOA working