modified s/://