added economy feature; all tests passing! w00t, etc