Ready for release, added parameters to srv