UPDATED AND WORKING 11/06/2019