Updated code to work with article