Changed to remove issue with some pathing