updated to get working without torquebox