refactored first article makeup