Modified to include dir rather than src