Farhat-Josh-080219-fixed