Feature/ace count