updated for Symphony 2.3