apply murase's change to src files