ALL ANNOTATION BREAKS FIXED