fixed annotation, some changes