changes for annotation library. currently broken :(