A few changes - made something global for Jiesa only