updated Jemula, rebase