Completed reconstructure of article controller