Revised annotation - still too memory-hungry to be ideal