Updated code to deal with f19