added annotations
removed local calls