Got annotations sorted out