Merging changes from tansaku form