better user, annotation orga