Jiesa improvments