merging jtal changes