Phoenix Reloaded

svn path=/branches/phoenix_v3/more/; revision=53348