changed to the annotations, and some marking of areas to fix later