Tested and working. Ready for test in Eucalyptus deploy