refactored a few methods for OLD version of annex
refactored to use a new version of annex