trying to change the extract logic for 2013