first version with export annotations