updated to account for annotations