changes + annotation generation